V2.x. Back-port PR #2334 to the v2.x branch #2581
+54
−12
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.